vtd cleanup: change some function return types to void

iommu_suspend(), iommu_resume(), iommu_enable() translation don't have
meaningful return values.  Changed their function types to void.

Signed-off-by: Allen Kay <allen.m.kay@intel.com>

diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c
index 28ce715c6bcd8c1391e2667bf98d6fe42b2b46de..e632dd285cfb6b97ebb5556c67995baef3370f8a 100644 (file)
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -634,7 +634,7 @@ static int iommu_set_root_entry(struct iommu *iommu)
     return 0;
 }
 
-static int iommu_enable_translation(struct iommu *iommu)
+static void iommu_enable_translation(struct iommu *iommu)
 {
     u32 sts;
     unsigned long flags;
@@ -661,7 +661,6 @@ static int iommu_enable_translation(struct iommu *iommu)
     /* Disable PMRs when VT-d engine takes effect per spec definition */
     disable_pmr(iommu);
     spin_unlock_irqrestore(&iommu->register_lock, flags);
-    return 0;
 }
 
 int iommu_disable_translation(struct iommu *iommu)
@@ -1046,8 +1045,7 @@ static int intel_iommu_domain_init(struct domain *d)
         for_each_drhd_unit ( drhd )
         {
             iommu = drhd->iommu;
-            if ( iommu_enable_translation(iommu) )
-                return -EIO;
+            iommu_enable_translation(iommu);
         }
     }
 
@@ -1799,14 +1797,14 @@ static int intel_iommu_group_id(u8 bus, u8 devfn)
 }
 
 static u32 iommu_state[MAX_IOMMUS][MAX_IOMMU_REGS];
-int iommu_suspend(void)
+void iommu_suspend(void)
 {
     struct acpi_drhd_unit *drhd;
     struct iommu *iommu;
     u32    i;
 
     if ( !vtd_enabled )
-        return 0;
+        return;
 
     iommu_flush_all();
 
@@ -1824,18 +1822,16 @@ int iommu_suspend(void)
         iommu_state[i][DMAR_FEUADDR_REG] =
             (u32) dmar_readl(iommu->reg, DMAR_FEUADDR_REG);
     }
-
-    return 0;
 }
 
-int iommu_resume(void)
+void iommu_resume(void)
 {
     struct acpi_drhd_unit *drhd;
     struct iommu *iommu;
     u32 i;
 
     if ( !vtd_enabled )
-        return 0;
+        return;
 
     iommu_flush_all();
 
@@ -1855,12 +1851,8 @@ int iommu_resume(void)
                     (u32) iommu_state[i][DMAR_FEADDR_REG]);
         dmar_writel(iommu->reg, DMAR_FEUADDR_REG,
                     (u32) iommu_state[i][DMAR_FEUADDR_REG]);
-
-        if ( iommu_enable_translation(iommu) )
-            return -EIO;
+        iommu_enable_translation(iommu);
     }
-
-    return 0;
 }
 
 struct iommu_ops intel_iommu_ops = {

diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h
index f230df7b8e9bbf14f2283ada51e9f3cb4bc56005..d68b41200c8d18ec31409e065e0baafb8a562569 100644 (file)
--- a/xen/include/xen/iommu.h
+++ b/xen/include/xen/iommu.h
@@ -110,7 +110,7 @@ struct iommu_ops {
 void iommu_update_ire_from_apic(unsigned int apic, unsigned int reg, unsigned int value);
 void iommu_update_ire_from_msi(struct msi_desc *msi_desc, struct msi_msg *msg);
 
-int iommu_suspend(void);
-int iommu_resume(void);
+void iommu_suspend(void);
+void iommu_resume(void);
 
 #endif /* _IOMMU_H_ */